From: Matthias Clasen Date: Sat, 23 Jan 2021 02:50:55 +0000 (-0500) Subject: Create a static library X-Git-Tag: archive/raspbian/4.4.1+ds1-2+rpi1~1^2~83^2^2~495^2~1 X-Git-Url: https://dgit.raspbian.org/%22http:/www.example.com/cgi/%22https://%22%22/%22http:/www.example.com/cgi/%22https:/%22%22?a=commitdiff_plain;h=14f0a0addb9a195bad2f8651f93b95450b186bd6;p=gtk4.git Create a static library Rearrange our build to create a libgtk.a for the the contents of gtk/, and build libgtk-4.so from our per-subdirectory static libraries. This will let us link tests statically for testing internal apis. --- diff --git a/gtk/meson.build b/gtk/meson.build index f1fd696297..dfbc36709d 100644 --- a/gtk/meson.build +++ b/gtk/meson.build @@ -1106,15 +1106,22 @@ darwin_versions = [ ] # Library -libgtk = library('gtk-4', - soversion: gtk_soversion, - version: gtk_library_version, +libgtk_static = static_library('gtk', sources: [typefuncs, gtk_sources, gtkmarshal_h, gtkprivatetypebuiltins_h], c_args: gtk_cargs + common_cflags, include_directories: [confinc, gdkinc, gskinc, gtkinc], dependencies: gtk_deps + [libgtk_css_dep, libgdk_dep, libgsk_dep], - link_whole: [libgtk_css, libgdk, libgsk, ], + link_with: [libgtk_css, libgdk, libgsk ], +) + +libgtk = shared_library('gtk-4', + c_args: gtk_cargs + common_cflags, + include_directories: [confinc, gdkinc, gskinc, gtkinc], + dependencies: gtk_deps + [libgtk_css_dep, libgdk_dep, libgsk_dep], + link_whole: [libgtk_static, libgtk_css, libgdk, libgsk ], link_args: common_ldflags, + soversion: gtk_soversion, + version: gtk_library_version, darwin_versions: darwin_versions, install: true, ) @@ -1264,4 +1271,11 @@ libgtk_dep = declare_dependency(sources: gtk_dep_sources, link_args: common_ldflags, ) +libgtk_static_dep = declare_dependency(sources: gtk_dep_sources, + include_directories: [confinc, gtkinc], + dependencies: gtk_deps + [libgtk_css_dep, libgdk_dep, libgsk_dep], + link_with: libgtk_static, + link_args: common_ldflags, +) + subdir('tools')